popupMenu: Display the proper animations for popup menus

BoxPointer's API changed to take a BoxPointer.PopupAnimation
enumeration value, but the code was accidentally replaced with
older code when porting the PopupMenuManager code to GrabHelper.

https://bugzilla.gnome.org/show_bug.cgi?id=689954

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 85acb70b2ddb9f46eeda8fca652abdfc4e9b8ff5..202ae3d35fdaa6bae6167d2ab1e7f4057078e963 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -2133,11 +2133,12 @@ const PopupMenuManager = new Lang.Class({
     },
 
     _changeMenu: function(newMenu) {
-        if (this.activeMenu) {
-            this._closeMenu(this.activeMenu);
-            newMenu.open(false);
+        let oldMenu = this.activeMenu;
+        if (oldMenu) {
+            oldMenu.close(BoxPointer.PopupAnimation.FADE);
+            newMenu.open(BoxPointer.PopupAnimation.FADE);
         } else {
-            newMenu.open(true);
+            newMenu.open(BoxPointer.PopupAnimation.FULL);
         }
     },